Make asm macros use the generally accepted comma-separated arg-passing style.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/vmx/x86_32/exits.S b/xen/arch/x86/hvm/vmx/x86_32/exits.S
index 43abba29c332e9fdbb700b09fd18d1af98d73b35..28a10807cb68d0274b351c4868b559b6d605ea5e 100644 (file)
--- a/xen/arch/x86/hvm/vmx/x86_32/exits.S
+++ b/xen/arch/x86/hvm/vmx/x86_32/exits.S
@@ -89,7 +89,7 @@ ENTRY(vmx_asm_vmexit_handler)
         call vmx_vmexit_handler
         jmp vmx_asm_do_resume
 
-.macro vmx_asm_common launch initialized
+.macro vmx_asm_common launch, initialized
 1:
 /* vmx_test_all_events */
         .if \initialized
@@ -140,10 +140,10 @@ ENTRY(vmx_asm_vmexit_handler)
 .endm
 
 ENTRY(vmx_asm_do_launch)
-    vmx_asm_common 1 0
+    vmx_asm_common 1, 0
 
 ENTRY(vmx_asm_do_resume)
-    vmx_asm_common 0 1
+    vmx_asm_common 0, 1
 
 ENTRY(vmx_asm_do_relaunch)
-    vmx_asm_common 1 1
+    vmx_asm_common 1, 1

diff --git a/xen/arch/x86/hvm/vmx/x86_64/exits.S b/xen/arch/x86/hvm/vmx/x86_64/exits.S
index bd411fa527c1d966a0cfb5cc95700f09915c09db..b965686b2a37ead0da7730819f6e0ad4fde78246 100644 (file)
--- a/xen/arch/x86/hvm/vmx/x86_64/exits.S
+++ b/xen/arch/x86/hvm/vmx/x86_64/exits.S
@@ -97,7 +97,7 @@ ENTRY(vmx_asm_vmexit_handler)
         call vmx_vmexit_handler
         jmp vmx_asm_do_resume
 
-.macro vmx_asm_common launch initialized 
+.macro vmx_asm_common launch, initialized 
 1:
         .if \initialized
 /* vmx_test_all_events */
@@ -147,10 +147,10 @@ ENTRY(vmx_asm_vmexit_handler)
 .endm
 
 ENTRY(vmx_asm_do_launch)
-      vmx_asm_common 1 0
+      vmx_asm_common 1, 0
 
 ENTRY(vmx_asm_do_resume)
-      vmx_asm_common 0 1
+      vmx_asm_common 0, 1
 
 ENTRY(vmx_asm_do_relaunch)
-      vmx_asm_common 1 1
+      vmx_asm_common 1, 1